Auto merge of #1850 - alexcrichton:update-docopt, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 28 Jul 2015 01:10:24 +0000 (01:10 +0000)
committerbors <bors@rust-lang.org>
Tue, 28 Jul 2015 01:10:24 +0000 (01:10 +0000)
Closes #1426


Trivial merge